Auto merge of #2154 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 19 Nov 2015 18:58:52 +0000 (18:58 +0000)
committerbors <bors@rust-lang.org>
Thu, 19 Nov 2015 18:58:52 +0000 (18:58 +0000)
Closes #2152


Trivial merge